disconnect from the right object ("closed" is emitted by the display, not

2006-01-10  Michael Natterer  <mitch@imendio.com>

	* gdk/gdkpango.c (on_renderer_display_closed): disconnect from the
	right object ("closed" is emitted by the display, not the screen).
	(bug #85715)

diff --git a/ChangeLog b/ChangeLog
index 001b81933979fa0cd9db390665f30c976aa56827..711d382a3f49ba17b0054554abca49b03ce4c1ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-10  Michael Natterer  <mitch@imendio.com>
+
+       * gdk/gdkpango.c (on_renderer_display_closed): disconnect from the
+       right object ("closed" is emitted by the display, not the screen).
+       (bug #85715)
+
 2006-01-10  Anders Carlsson  <andersca@imendio.com>
 
         * gdk/quartz/gdkproperty-quartz.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 001b81933979fa0cd9db390665f30c976aa56827..711d382a3f49ba17b0054554abca49b03ce4c1ca 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-01-10  Michael Natterer  <mitch@imendio.com>
+
+       * gdk/gdkpango.c (on_renderer_display_closed): disconnect from the
+       right object ("closed" is emitted by the display, not the screen).
+       (bug #85715)
+
 2006-01-10  Anders Carlsson  <andersca@imendio.com>
 
         * gdk/quartz/gdkproperty-quartz.c:

diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index f822b2503a35ae1f388e60c002f5fe67e6236adc..9cea1cb32b6b48aabc74f197960086ed69b7f38e 100644 (file)
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -544,10 +544,10 @@ on_renderer_display_closed (GdkDisplay       *display,
                             gboolean          is_error,
                            GdkPangoRenderer *renderer)
 {
-  g_signal_handlers_disconnect_by_func (renderer->priv->screen,
-                                       (gpointer)on_renderer_display_closed,
+  g_signal_handlers_disconnect_by_func (display,
+                                       on_renderer_display_closed,
                                        renderer);
-  g_object_set_data (G_OBJECT (renderer->priv->screen), 
+  g_object_set_data (G_OBJECT (renderer->priv->screen),
                      g_intern_static_string ("gdk-pango-renderer"), NULL);
 }